Merge from trunk.
authorPaul Eggert <eggert@cs.ucla.edu>
Wed, 15 Jun 2011 18:07:38 +0000 (11:07 -0700)
committerPaul Eggert <eggert@cs.ucla.edu>
Wed, 15 Jun 2011 18:07:38 +0000 (11:07 -0700)
commitee8d627159ae232183de36429cec197d0765b8c5
tree92f5de2ec926664df462f5c1fcff5d9487770fb3
parent5a8d61d1c0d816e75f304a67b41d93c96ec44860
parent0b6e3ffb1567df37d0b708ce2338e578a7751c8a
Merge from trunk.
src/ChangeLog
src/xfns.c